Sync with the main repo #87
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Emil Engler <[email protected]> Co-authored-by: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= <[email protected]> Co-authored-by: Hennadii Stepanov <[email protected]> Co-authored-by: Jarol Rodriguez <[email protected]>
We don't always want to finalize after signing, so make it possible to do that.
Shift RPC server option to use "P" instead
To allow easier access to the node's datadir and debug logs.
Co-authored-by: Amiti Uttarwar <[email protected]>
Co-authored-by: Amiti Uttarwar <[email protected]>
This change gets rid of the magic number 0 in the DescriptorScriptPubKeyMan::GetOldestKeyPoolTime() function. No behavior change.
This change suppress the "keypoololdest" field in the getwalletinfo RPC response for blank descriptor wallets.
Also, simplify unit tests with the CDataStream::str method.
Also, add Span<std::byte> interface to strencondings.
The function `trueDummy` in feature_nulldummy.py is currently more complicated than it needs to be. Rather than converting the scriptSig to a CScript and looping through it to build a new scriptSig with the modified push, simply directly replace the push of null (OP_0) with a push of one (OP_TRUE/OP_1). Note that on master, actually an element with the value of 0x51 is pushed (0x0151...) -- this was very likely not intended, as 0x51 is the script op-code for OP_TRUE, and also the function's name suggests that the "true" value shall be pushed.
The name is changed to match the coding guidelines (snake case) and to be more descriptive.
The `create_block` helper accepts a list of txs that it includes in the created block, hence we don't have to do that manually. Also, rehashing before solving the block is not needed and can be removed.
Current CWalletTx state representation makes it possible to set inconsistent states that won't be handled correctly by wallet sync code or serialized & deserialized back into the same form. For example, it is possible to call setConflicted without setting a conflicting block hash, or setConfirmed with no transaction index. And it's possible update individual m_confirm and fInMempool data fields without setting an overall consistent state that can be serialized and handled correctly. Fix this without changing behavior by using std::variant, instead of an enum and collection of fields, to represent sync state, so state tracking code is safer and more legible. This is a first step to fixing state tracking bugs https://github.com/bitcoin-core/bitcoin-devwiki/wiki/Wallet-Transaction-Conflict-Tracking, by adding an extra margin of safety that can prevent new bugs from being introduced as existing bugs are fixed.
From what I can see the only platform this drops support for is CentOS 7. CentOS 7 reached the end of it's "full update" support at the end of 2020. It does receive maintenance updates until 2024, however I don't think supporting glibc 2.17 until 2024 is realistic. Note that anyone wanting to self-compile and target a glibc 2.17 runtime could build with --disable-threadlocal. glibc 2.18 was released in August 2013. https://sourceware.org/legacy-ml/libc-alpha/2013-08/msg00160.html
This reverts commit e61d42d.
5202bd1 test: Bump shellcheck version to 0.8.0 (Hennadii Stepanov) Pull request description: Among [added](https://github.com/koalaman/shellcheck/blob/master/CHANGELOG.md#v080---2021-11-06) rules, SC2295 could be [useful](bitcoin/bitcoin#23506 (comment)) for us. ACKs for top commit: dongcarl: Code Review ACK 5202bd1 fanquake: ACK 5202bd1 - would have rather this just been a part of #23506 to avoid another PR and pointless rebasing. Tree-SHA512: fd7ff801c71af03c5a5b2823b7daba25a430b3ead5e5e50a3663961ee2223e55d322aec91d79999814cd35bd7ed6e9415a0b797718ceb8c0b1dbdbb40c336b82
To use the `QStringLiteral` macro, the `QString` header should be included, that is done already.
This incorporates the new bitcoin-qt init implementation into the qml-gui.
|
The only non-trivial difference with my own branch is: |
Guix builds: |
|
ACK ef99bc9 |
Merged
hebasto
added a commit
that referenced
this pull request
Jan 5, 2022
Pull request description: Sync with the main repo up to bitcoin/bitcoin@3699786. To avoid merge conflicts, 22 commits have been reverted following the commit history. The first 15 of them belong to #87. 20 of them have been cherry-picked back in order of their initial appearance in the commit history. Commit 7fd3c91 _"build, qt: Add RISC-V detection"_ is no longer needed as it has been implemented in the upstream. Commits 26ce35f _"build, qml: Fix compiling with GCC 11"_ and 95b80c0 _"Avoid applying of a patch with fuzz 1"_ have been combined into a new single commit _"build, qml: Fix compiling with GCC 11"_. A "build" part of the commit _"qml, build, doc: Allow import QtQuick.Layouts"_ has been moved into the _"build, qml: Add qtdeclarative module"_ commit. Also Qt Quick module versions were bumped according to Qt 5.15.2. An excerpt from Qt "Configure summary" on Fedora 35: ``` Qt QML: QML network support .................... no QML debugging and profiling support .... no QML just-in-time compiler .............. yes QML sequence object .................... yes QML XML http request ................... no QML Locale ............................. yes Qt QML Models: QML list model ......................... yes QML delegate model ..................... yes Qt Quick: Direct3D 12 ............................ no AnimatedImage item ..................... yes Canvas item ............................ yes Support for Qt Quick Designer .......... yes Flipable item .......................... yes GridView item .......................... yes ListView item .......................... yes TableView item ......................... yes Path support ........................... yes PathView item .......................... yes Positioner items ....................... yes Repeater item .......................... yes ShaderEffect item ...................... yes Sprite item ............................ yes Qt Quick Controls 2: Styles ................................. Default Fusion Imagine Material Universal Qt Quick Templates 2: Hover support .......................... yes Multi-touch support .................... yes ``` #### Guix builds: ``` $ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum 69492cd3777954f2771cfe8e733c8dba18a9182310a3fbd16b04e3663c846e46 guix-build-c8f4e0398d0e/output/aarch64-linux-gnu/SHA256SUMS.part b2b3a06024980b83e9c8277fdb0f70ec7d5d15ada04124e13d1746baf5c6ba95 guix-build-c8f4e0398d0e/output/aarch64-linux-gnu/bitcoin-c8f4e0398d0e-aarch64-linux-gnu-debug.tar.gz cc0404ba6c5161a7da72fe1905d4476209ad2e43796df3d667b844c74f313f2e guix-build-c8f4e0398d0e/output/aarch64-linux-gnu/bitcoin-c8f4e0398d0e-aarch64-linux-gnu.tar.gz c14a4f1cee523117be00863b5751c03b9ca24cddf76920adf28cf29adef5016c guix-build-c8f4e0398d0e/output/arm-linux-gnueabihf/SHA256SUMS.part f1d0b7202223296bcdde9878c9bfd60253c2d2530a74a3c94ed82b90568cc866 guix-build-c8f4e0398d0e/output/arm-linux-gnueabihf/bitcoin-c8f4e0398d0e-arm-linux-gnueabihf-debug.tar.gz d07722b96f07166328d218716e3ff7dabcf8f6d35f906378214a97b88f6cbb09 guix-build-c8f4e0398d0e/output/arm-linux-gnueabihf/bitcoin-c8f4e0398d0e-arm-linux-gnueabihf.tar.gz 89ba246d916d5805159bd92d23bd620a3cf6c6bdee962214120c5005eabd4b75 guix-build-c8f4e0398d0e/output/dist-archive/bitcoin-c8f4e0398d0e.tar.gz 1dcf2101a3c766724d0fdbeca7c61b3d501081d3c166b3b9d9e52418f6f34bb0 guix-build-c8f4e0398d0e/output/powerpc64-linux-gnu/SHA256SUMS.part b563412fc17fc5189a8e8320096113f4d5c42011904c78e92db21929e8c565f5 guix-build-c8f4e0398d0e/output/powerpc64-linux-gnu/bitcoin-c8f4e0398d0e-powerpc64-linux-gnu-debug.tar.gz fa38f1520dc04e2fca68031bbd13ff67c42c7bf26003e93a7927dde8e904da6b guix-build-c8f4e0398d0e/output/powerpc64-linux-gnu/bitcoin-c8f4e0398d0e-powerpc64-linux-gnu.tar.gz beac355a65c78c93963c23707667ce7a96e2550edcdad37dfc7c1ce6dbc5bf14 guix-build-c8f4e0398d0e/output/powerpc64le-linux-gnu/SHA256SUMS.part c813ba3b3de89d331138cdcec609efe0fd7e3320b3c28a7c4fcf5537bb05c614 guix-build-c8f4e0398d0e/output/powerpc64le-linux-gnu/bitcoin-c8f4e0398d0e-powerpc64le-linux-gnu-debug.tar.gz 2d22178891c3a605a1a4e2a35797bf4e38dfea0245189605d7baf7165227ce75 guix-build-c8f4e0398d0e/output/powerpc64le-linux-gnu/bitcoin-c8f4e0398d0e-powerpc64le-linux-gnu.tar.gz 9290ceb49f237f78ae0aa1ff746f4a36d0cfe0db2caf82811c263133b4dab9d6 guix-build-c8f4e0398d0e/output/riscv64-linux-gnu/SHA256SUMS.part 562ddb5af2cd8d605bb933d516210525459398f52e7a6070e930c93fd2861b80 guix-build-c8f4e0398d0e/output/riscv64-linux-gnu/bitcoin-c8f4e0398d0e-riscv64-linux-gnu-debug.tar.gz 65c6faa6a69e288ff1cf26d2f57dc407ef398e6eb86aac9f38035037960b4472 guix-build-c8f4e0398d0e/output/riscv64-linux-gnu/bitcoin-c8f4e0398d0e-riscv64-linux-gnu.tar.gz 647c127b1b656e667bcb4435a4472ee680027515f6cecd7b0a07f022dc7cf5e3 guix-build-c8f4e0398d0e/output/x86_64-apple-darwin/SHA256SUMS.part 3eeb8449b9cb350ff442211df7b4f6858fbff610ed4157d1585800efc16bab81 guix-build-c8f4e0398d0e/output/x86_64-apple-darwin/bitcoin-c8f4e0398d0e-osx-unsigned.dmg b5f9b759fb69a349f41557d0f78df2367f7d52f56d3c2e8f71ee4533b5be4bc7 guix-build-c8f4e0398d0e/output/x86_64-apple-darwin/bitcoin-c8f4e0398d0e-osx-unsigned.tar.gz 83b98e6c298dbf32997d90d1001d8257eeffec51a3feea7df454d122b5d512a5 guix-build-c8f4e0398d0e/output/x86_64-apple-darwin/bitcoin-c8f4e0398d0e-osx64.tar.gz ad7a69cba6a331e36a7069f2391903b4f63584eccbd74009dffc2dd135d18efe guix-build-c8f4e0398d0e/output/x86_64-linux-gnu/SHA256SUMS.part 290ace50b1049a8494370a68191b86e4beab15b0afe0947ea2090f98bc1c037c guix-build-c8f4e0398d0e/output/x86_64-linux-gnu/bitcoin-c8f4e0398d0e-x86_64-linux-gnu-debug.tar.gz 6713f955a9d4ab488cfaf3b97d4d59a0a11c6bdaeba27ddbb15a2d1fb82e3c7c guix-build-c8f4e0398d0e/output/x86_64-linux-gnu/bitcoin-c8f4e0398d0e-x86_64-linux-gnu.tar.gz f85f19a7437a3eec7597cb6e855d6e529051634bdea74b94e2d17fb1862d810e guix-build-c8f4e0398d0e/output/x86_64-w64-mingw32/SHA256SUMS.part d307ecae13388ed373d8252971d5b9949a21e016d03bd2726a4455a7af35f8ba guix-build-c8f4e0398d0e/output/x86_64-w64-mingw32/bitcoin-c8f4e0398d0e-win-unsigned.tar.gz 1f281e0e42cf8350ec9d51c875b8fff7f20b11e5e33dda08dcb2ee8a2c33615a guix-build-c8f4e0398d0e/output/x86_64-w64-mingw32/bitcoin-c8f4e0398d0e-win64-debug.zip a8c04d2a61852ed9bbd9a01ed9419c3eb52c788d942a5b24f8e45c2d29d0df69 guix-build-c8f4e0398d0e/output/x86_64-w64-mingw32/bitcoin-c8f4e0398d0e-win64-setup-unsigned.exe a67317e2ef08346858aa766176a79449639c1780ed4499d7a14e2ebcf7ab9ffc guix-build-c8f4e0398d0e/output/x86_64-w64-mingw32/bitcoin-c8f4e0398d0e-win64.zip ``` [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/91) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/91) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/91) ACKs for top commit: promag: Tested ACK c8f4e03 on macOS 12.0.1, Android 10, and Windows 10. Guix build hashes match as well. Tree-SHA512: a236ac2a6611016452c24f6972febd59e777bb24810dac13d208dae265632396f07741e99a51e77042026bbeebfcf11ded21c261c6b1346bb48c0910d90535df
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sync with the main repo up to bitcoin/bitcoin@c9d7d0a
To reproduce:
GUIX HASHES